refactor: shuffle code and responsibility of LocalState #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Achieve this by moving the state saving and loading responsibility to the LocalState itself
This reverts commit 913e3e9. # Conflicts: # linkup-cli/src/remote_local.rs
ostenbom
approved these changes
Nov 20, 2023
Comment on lines
+42
to
+49
| let server_config = ServerConfig::from(&state); | ||
|
|
||
| let server_session_name = load_config( | ||
| &state.linkup.remote, | ||
| &state.linkup.session_name, | ||
| remote_server_conf, | ||
| server_config.remote, | ||
| )?; | ||
| let local_session_name = load_config(&local_url, &server_session_name, local_server_conf)?; | ||
| let local_session_name = load_config(&local_url, &server_session_name, server_config.local)?; |
linkup-cli/src/background_booting.rs
Outdated
Comment on lines
104
to
127
| .map(|local_service| StorableService { | ||
| name: local_service.name.clone(), | ||
| location: if local_service.current == ServiceTarget::Remote { | ||
| local_service.remote.clone() | ||
| } else { | ||
| local_service.local.clone() | ||
| }, | ||
| rewrites: Some(local_service.rewrites.clone()), | ||
| }) | ||
| .collect::<Vec<StorableService>>(); | ||
|
|
||
| let remote_server_services = state | ||
| .services | ||
| .iter() | ||
| .map(|local_service| StorableService { | ||
| name: local_service.name.clone(), | ||
| location: if local_service.current == ServiceTarget::Remote { | ||
| local_service.remote.clone() | ||
| } else { | ||
| state.linkup.tunnel.clone() | ||
| }, | ||
| rewrites: Some(local_service.rewrites.clone()), | ||
| }) | ||
| .collect::<Vec<StorableService>>(); |
There was a problem hiding this comment.
nit: the local_service variable name in the map here is confusing, maybe just service?
There was a problem hiding this comment.
Or switch local to remote in the remote case
There was a problem hiding this comment.
That's a good point! Changed on 28055f6
ostenbom
approved these changes
Nov 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This changes make so that we stop using methods from the
startcommand around the code.To achieve this, the responsibility of loading and saving the state is now part of the implementation
of the
LocalStateitself.Other notable changes
StorableSession, now there is aServerConfigwhichholds a
localandremotefields. Where this struct is located could be moved, but didn't gave that much thought.